[Misc] Small improvement for tests