Make tests pass
Merge branch 'fix-test'