Cleaned up tests.  Abandoning dotted pairs for now.