Update rspec and guard; use feature/scenario in one spec