Finish 9.1 part and fix RSpec test