WSOTWO-142: Fixed tests