restructered tests