Updated todo.
Moved entity tests to rspec.