Improved initial test data