API tests fixes moved from master