tst: cleaned up tests
fix: resolved conflict
Merge pull request #754 from satra/fix/tests

tst: cleaned up tests