Revert to before separating English to Xitsonga and Xitsonga to English so I can add tests first