can't think of any reason to have 15 1-line test files; this looks a lot cleaner
Merge pull request #4059 from jlipps/fewer-files

consolidate test files
make sure publish script is smart about how to tag a beta release (fix #4057)