Intermediate state for HA tests

Removes dependency on backup, which is currently broken and probably will be
 permanently removed for 2.2 anyway
All tests now compile