Generics were added. Tests for generics were added. Tests for including
were added.