Hardening/harness errors under valgrind

### Description
Made the harness and valgrind tests a little easier on the eye.
Fixed a few errors in harness tests.

Fixed in dc637b37132098f0f82735c5b7f44b9c06f18c7d