Rearrange tests and add parsers