Added record type normalization, added additional unit tests.