Add amendement parsing and test