Merge/rename old credentials test.