Updated tests for new behavior