Revert "Hide poorly designed ICommand methods"

This reverts commit 19c64700474a747e123d22198dd076cef8e776b3.
Revert "Get the tests to compile not really RIP me"

This reverts commit 33e7895b24ea57f64327de2f1fb796c10059410a.