Updated tests to fix changes.