BS-8194 Fix Studio TEsts