fix tests
Merge branch 'fix-tests' into refactor