Updated tests to suit new database structure. I know that this breaks the test-driven-development philosopy :(