Patches for New Testing Infrastructure [sf#1185704] [#490]