Removed super class which caused a JUnit3 runner to be used (#11184)

Change-Id: Ib5d639e8c86c19902b77ce4681554065ee9be645