added some more tests and made sure setContextClientId is compatible with setClientId by returning $this