Fix tests

Part of a larger effort to get unit tests working with the OTM2-vagrant project