changing test to reflect the new database model
merge