Updated behavior and test.