Skeletoned out tests.  Added some extra methods to assignment.
Reorganized a bit.