Tests restructured