Dealing correctly with non existing enum value + test cleanup