[PATCH 0/2] Tests updates