Added remaining tests.

It looks like Eclipse format will just wipe out this kind of formatting, so don't bother. In the long run it's easiest to just go with Eclipse.