Moving integration test to where it belongs