Clean up some unused test code