Added better separation of tests, moving the FS tests into source/test_fs