Changed method names for new unit test to new format.