refactor checker
tests checker