Restructured test project