Issue #2164379 by Mile23: General improvements to SimpleTest Example.