Better autonomy and few tests