restructured tests