Fixed some of the nomenclature in the unit tests.