Tests pass!
Update enums and tests