Fix/refactor custom type tests