Fixed reference to context.
Removed tests for deprecated code.