Rename test files
Fix error loading initial set of keys