test: clean up tests a bit