Munging to get make test working on jenkins