More test commits. Trying to fix annoying problems with credential store...