Removed duplciate files, made FsysBasicTest compile.