cleaned up filetools + moved testcases
fixed testcases