Various fixes, mostly related to testing, and update of Server.js