Changes committed as a result of unit testing and unit test changes

Unit test mods to be less reliant on database data