organized the tests a bit.  started on the whole camel-case classes-are-capitol rule, but I have a ways to go before that is consistent everywhere.