[WIP] T/rspec fix