Improve test coverage of behavior