Fix class name
More integration test separation