Fixed unit tests and changed how the clientId tests are performed in token endpoint