Added type parameter in tests