fix build for moved directories
Extend Item test
Fix incorrect override