fix tests scripts to work after recent key refactoring