Undid some of the changes to make this test independent of current database data