Fix enums and test to allow adding tags