Merge "Add unit tests for ShellSubscriber and fix a bug"