Added stuff like a test client.