Removing accidental test case.
Fixing up some small errors.
A few more minor code cleanup bits.