Test harness improvements
Reverted include