Remove unused enum (and fix tests)