Removed unused imports. Made pep8 fixes.
Updated test for new approach to label.
Removed before_ and after_context from templates and values passed.