Add other check methods and DO test