Updated tests to reflect recent code changes.