Removing unecessary generics
Removing useless warnings
Tests updated