Made sure that the unittests were up to date with the current version of code
Authored by: davidfange 2015-05-25
Parent: [r728]
Child: [r730]