Changes to test timings, fixes to test data