JAL-3468 unit tests updated for changes