Refactoring collection specs, removing deprication warnings and changing timeout to see if that makes travis more stable.