Probably we need to clean this up with a command test helper.

Resolved.