[TASK] Test cleanups and improvements