Removed deprecated classes.  Updated tests.  Fixed more bugs.