Add Test Outputs
Fix Stupidity
Merge branch 'master' into AlternateGUI