Removing dummy context.
Few fixes after review, and fix the tests.