Updated tests to reflect change in implementation