Tests-helper fully migrated