WSOTWO-142: Improved performing testing