Fix for ui tests