Updated tests to correspond with refactor