Added missing unit tests (shell only)
Switched to using all com.google.inject annotations instead of some
javax.inject and some google.  Closes #208