more normalization and tests