Proper cleanup of test key and reduced risk of name clash