Add more frozen constants
Gather code coverage