Go away tests you bothering me

Change-Id: Ied98a1af0110b2ee117eb553d1276fc4f6c3ee02