Tests were rewriten to use generics.