[TASK] Shorten the extend class in all unit tests