Cleanup self tests