Actually working against the demonstration server.
Fixed tests