Restructured Test package