Add framework for optional checks
Add tests for optional checks
Merge pull request #555 from presidentbeef/optional_checks

Optional checks