Revamp the integration tests to make it easier to compare with expected output