Updated tests to reflect changes