Updating todo and renaming feature tests to correspond to new method names.
Context feature tests.