Updated comparison and normalization tests.