Refactored tests to correctly work with the new integra version