Merge branch 'ew/tests'