Won't be needing Simpletest cruft

Change-Id: I30d6fb7b85cecf3b1971905126ccf465e9fc8c3a