Fix some broken tests
Update gemspec