Add tests for optional checks