renamed tests and tuned output