WIP: test fixes
WIP: fix valueOf