Pytests and dnet_recovery fixes