Add checkvars for test purposes