- proceed writing tests and fixed enum