Issue #182: full complement of baseline lock tests added