Removing out of date testing cruft