Add sample data and improve the testing tool