Make more tests work