Updated tests to match changes in last commit