adding support for context, with tests
adding identify context test