Extracted spec-helper, updated TODO.md