Add normalizer and reorganized integration tests