When I left this repo, there were quite a few hacks I had tried, but ultimate caused this repo to be in an unclean state: I should clean it up and ensure that I can run unit tests again.