Fix tests
client = new ShellClient(surface) is most likely a leftover after a merge conflict.
Yes the code had a merge conflict. Sorry about that.