Refactor execute_command matcher and specs.

...and switch to the new RSpec syntax, Yay!