Updated aries unit tests.  Fixed a couple of issues with other
classes/jsp files.