a few tiny new regression tests and better normalized/organized names