JAL-2740 additional unit testing