some cleanup, more verbosity for failing tests