Updated Checker class and associated tests