Fixed the credentialsStore + tests