Update specs & fix Rakefile