tst: cleaned up tests