Fix tests, and clean servlet output