Nobody else needs signature.OrDefault()
Improve test coverage, extend more APIs