tests restructured