Simplified Session; Added test; Simplified language Directive

I need to remember to add a cancel to the language directive.