Making some more tests work