MX-3 test scenario now waits for confirmation when creating a lock. Minor other changes