Minor re-arrangement of files and test files in test folder