Updated integration testing steps + refactored