Start testing hash envelope validation
Small readibility change, no functionality update