[IMP] Improve automated tests