Updated tests to be consistent with refactored code