Cleaned-up DB model and added test data