update tests
switch to the simpler parser
-