Style improvements

This change improves some of the coding style around testing.