Fix some tests, update some gems in gemspec
Merge remote-tracking branch 'gerry/fix_some_tests'
back to 3.2.16