better inclusion of test data sets