Move some more integration tests