Added all vars to test