Repair tests and other fixes
revert accidentally pushed commit and fix test failures introduced by https://lab.nexedi.com/nexedi/slapos.core/merge_requests/192
revert accidentally pushed commit and fix test failures introduced by https://lab.nexedi.com/nexedi/slapos.core/merge_requests/192