Restructured the test file to give each test fresh fixtures and clean
them up afterwards + remove workaround