Added more shell tests