Fix verbosity and add more tests still.