Remove output stream fiddling as it stops run/tests returning an error code on test...