Merge "Increase testing via DOM." into main