Typos.
Clean up verbosity.
Restore root make test.