Added remaining enums and started testing,.