Remove legacy diablo and essex test cruft

Remove the legacy cruft that is no longer used from diablo and
essex.

Change-Id: I4c00b12ef6d31c8387cdf12e58aed7416ede9f2d
Merge "Remove legacy diablo and essex test cruft"