restructured test package