Improve test daemon status text.
Renumber tests categorically