moved cleaning of the testserver into its own target.