Modify tests to reflect new expected behavior