Update naming of test to reflect class methods under test