Added the cvar and var to the unit tests