Update tests to reflect new database structure