Fixing a parsing issue
Fixed some tests and e