Fix basic itests