Improved web test impl