Repair tests and other fixes

revert accidentally pushed commit and fix test failures introduced by nexedi/slapos.core!192

See merge request !216