Update rspec, stubs, and for new UI