Integration test refactoring. 97 failed tests.