Updated tests
Fixed normalize