Clean up test_shell so that the tests are captured though the test framework.

Also makes a small modification to gitignore.

Change-Id: Iefbfbcfd35270b06ed65edb34708fa9b4d5bf563