Change expects to stubs for optional_commands support

Signed-off-by: Ken Barber <ken@bob.sh>