Fix take test key preserving