Fixing options and rspec tests to work