Replace normalize with reset
Added some test tags
Split helpers into its files
Update