Extra tests, move of test data.