Resolve review comments.

Changed the Assert calls to static imports.  Removed unneeded
@link qualifiers in the unit tests too.