Work on unit testing.  All tests now run but fail.