Added Unit test for checks
Reverted problematic commit