Fixed strange dependency issue with integration
Fixed the rest of breaking tests