Disable weird broken test

Change-Id: I3ee86f072e991bd9abe3c2e880e93fc539271371
Fix up spelling mistake

Fixes bug 1253510

This was causing a KeyError when e2label didn't work

Change-Id: I0646409cdffa4d6d5d8b2c7a9e3c300022d1c9b8