More changes to test credential manager