Fix all tests to work with just integration-test dataset