remove error message from tests
Merge branch 'master' into answers