Refactored navigation feature

Fixed grading tests
Merge pull request #1232 from edx/will/navigation-grading-test-fixes

Fix navigation and grading acceptance tests