- Modified testing to accomodate new split between stdout/stderr.
- Corrected test count and removed diag output.