JAL-2114 added single-locus case and more error tests