Changed the unit test definitions so that all of the tests run.