Some cleanup and WebHook Test with embedded server