updated rspec including TODO's