Removed obsolete unit test.  Updated spring beans context to be in synch
with bean changes.