Fix more servlet path mapping problems
Some more default servlet tests