Moved enums to avoid running them as tests

Change-Id: I52cbd9582345a3c0d49caf2ad265a659bf3fe0f1