Update tests for new behavior