Finish add Checkbox
Add sample tests
Merge branch to master