changed database design, added test data