Add missing api
Remove old workaround
Mobile tests update