Moved non fs into fs-testing