cleans up tests
Fix broken test
Merge branch 'pr/697'