Added some more tests, bug remains, added x(y=>'z', z=>'y') syntax for ContextSettings