Fixed several parsers, and added more tests