Cleanup tests

way too much copy-paste in the tests! Replace with setup/beforeeach where needed