Clean up the tests a bit, make them reflect reality better
Clean up the tests a bit, make them reflect reality better

yannbelief/escservesconfig,yannbelief/escservesconfig,yannbelief/escservesconfig,yannbelief/escservesconfig