Added test files in proper position and modified MainTest accordingly.