Clean up strange ftl cruft in webservice and fix up tests