refs 23524

Added additional unit test coverage