Fix unit test and reduce verbosity