Rename classes; add test parser for mbassador
Write benchmark