Updated structure to correcly run integration tests