Update tests to reflect current behavior