Add more tests; Remove conditional rule.run in Check class