tests restructered