Add plan statements, and using the "t" convention inside tests.
Fixing whitespace; a bit of cleanup.