Renamed enum, fixed unit test