Types revamp with test.