Some of the utility classes have duplicate functionality, e.g. multiple versions of ForwardingMap, overlapping MockMultivalueMap/MultivalueHashMap, etc. They need to be consolidated (i.e. use a single version).

Also, they need to be documented (i.e. provide instructions to tutorial users to copy them).