Recreate gemspec + update tests