Rearranged test files and updated make test, and test-suite.hs