workaround vhnd_availability coupling to report in tests
cleanup function, fix tests
Merge pull request #4056 from dimagi/fix-tests

Fix OPM tests