Fix tests for behavior changes