fix typo in tests
Merge branch 'master' into answers
fix tests
Merge branch 'master' into answers