added: flags, enums. Testing improvements