moved a test, made a test more comprehensive, and addressed some code reviews