changes to migrations, fixing rspec