Updated more unittests
Updated remaining unittests, fixed a few parser bugs