Fixing test names and descriptions

Change-Id: I8a14ce59efc6bdbed78d107433badf09b69ff1fc