Refactoring, readme changed, DBTestData added