Changed checker modules and added new tests