Lots of cleanup.  Added ViewTest.  Fixed several JUnit test problems.
Resolved minor confilct.