Fix commander spec because of expectation failures