Fix test variables...