Added normalization and test