added test data; new tag-oriented FS; stuff