fix checkbox marking issue when using model and update tests
Merge pull request #24 from perka/new_tests

fix checkbox marking issue when using model and update tests