simplified and added test data