test clean up, better template