test cases, cleanup
more cleanup
cleanup for make check
Merge pull request #4720 from jbclements/syntactic-cleanup

Syntactic cleanup