Clean up testing using new builder methods on types

Created by  korrat  on December 17, 2022
KBSTC23N5DUM6YI7L2NB7CERADNBLMM776SVOTIOP5S7COFTN77AC
Change contents