simple-check -> test.check, part 2