Made a few more integration tests