Further cleanup of the test management command.