add normalization and fix tests, which assumes no normalization