Credentials test fixes and cleanup