more tag fixes plus another file addition test
Merge pull request #2022 from mollybostic/master_0901

more tag fixes plus another file addition test