trivial cleanup and remove verbosity of testing