Add more tests and test data