Started integration testing some more