Shell tests improvements