basic diff parseing + tests