Restructured test file layout

Restructured test layout

Updated test-all script