Add more shell tests