Fixed test error.
Refactor Generics