Refactor z-score key, add test