Pointer to Context, fixed path comparison.
Removed old code, updated acceptance tests with new dsl (but commented them out for now).