Fix compiler error.
Add more test cases to shell-tests.