improve test and test data