Try to expose the underlying pointers in fewer places
Remove debug junk from test