Minor updates
restructuring the test files