Added rspec and guard