Splitting file feature actually implemented. Tests fixed + test clean up