updated integration tests to new package structure