decrease verbosity and improve tests