Fixed the integration tests
Annotated the integration tests to their correct groups