Another fix for webapp test and behavior.

The previous commit didn't really fix the issue