Added type args to remove warnings in tests.