Test fixes & a few comments
Merge pull request #3158 from eileenmcnaughton/tests

Test fixes & a few comments