[#80559928] Tweaks to unit tests, chasing intermittent error in Travis for DataAccessManager not initialized