Add guard and RSpec