Reverted these tests to match earlier behavior.