Tests and improvements.