rearrange parser & serialization tests