Fixes for OVA went in independently of updates to the tests. The tests need to be updated so that master builds.