restructured test locations