More tests, missing pieces for cmd health checks