Small cleanups 3

Another round of small cleanups to whitespace and style, plus removing some unreferenced tests.