Fix Item Map test
Add auto-cleanup