use accurate css class
adjust SetTest
Merge branch 'reusable-checkbox' into issue-1554