Follow-up for 22a4e5bd0a7c0a92b54b9965984b582fd42099f2, fix .checkOn, add support tests. Cloes gh-1199.