Merge pull request #158 from cyberious/3.1.x

Update tests to ignore warnings but still look for errors
Deduplicated the resources that were common amoungst many of them, would love to push them all into a hash and user merge instead
Merge pull request #159 from cyberious/3.1.x

merge Master back up to 3.1.x
Merge pull request #160 from cyberious/dedup_params

Dedup params