improved database structure, test data added