redo based on rspec