Added more shell tests

Change-Id: Iaed7c0914285721f5a4d417281620e6928ffb4e6