Improve WebAppFunctionaTest