Restructured test projects