Tidy up some unused bits test code that were left in.