Integration tests

All of these changes modify integration tests to fit the new styling