Updated parsing mechanisms and added a few more tests.