wrote more tests, and added missing parsers