Liveness output clean & a couple tests