[+] Types for const state assignments
[+] More tests