Intent API tests fixes