Refactor tests for type
REFACTORING : move from should to expect syntax
REFACTORING : use stubs instead of expects for commands