Adding more test coverage for shell implementation