Added Test for Generics
Added test with generics from added method
Added generics statements on constructor
Merge remote-tracking branch 'upstream/master'