More servlet tests

It is getting quite disorganized there.