Add some Xmrs tests and conform a couple functions
Merge branch 'master' of https://github.com/goodmami/pydelphin