Tweaked the way test apps get loaded...