Bug fix: test build threads had file var conflict
Added FileSystem constructor, name member