Fix test to fit newly thought design