Replaced the unit-tests with generic types