Faster bookmark spec with stubbed user
Clean up some rspec code