[TASK] Further improve tests