Test Reformulated

Still failed to compile: error reported by Netbean
Rename test files