Update schema.rb to reflect current production schema

I also moved two tests to RSpec as I had to change them and prefered to do it in RSpec.