Do some more stuff for integration tests
Fix another test