Fix sample data and tests.