separated test files and fixed mf