test data and fix bugs