Added some additional behaviors and added a new test to validate those behaviors.