Update shell specs.
Clean up shell response and change specs to use new syntax.