Added unit test for new behavior