Merged in changes from master and Item13897. More work is needed!

 - Need a way to force a clear of the cache before each test.
   sub _clearCache is a start, but needs url params to trigger the
   clear and needs execution by admin.

Also deleted a call to &UI_FN  which didn't exist.  Not sure what to do
there.