Add util stuff for Items
Rename tests
Add more wrapping stuff