Fix failing servlet tests