JAL-1705 further unit tests