Correct shell and add test case for shell