Refactoring short shas on test