Integration Test, make it better