Unit test changes

Changing unit tests to make them repeatable independent of database
data.