Improved handling of verbose/testing.