Testing and improvements