refactor Signature spec a bit more