Separate large test into two tests.
Update for new test data set.
Update tests for new test data.
Clean up tests for new test data set.