Fix mistakes, add rspec