complete changes for mvp with rspec errors