Fix modi and state enums
Added google mock sanity test