Introducing generics, new tests fail...