Fix typedfield stuff
wip
remove tv mapper for now
Fix test code to match