Clean up test.__init__