Improve testing of the shell.