Remove class vars from Item, fixed tests
Merge branch 'develop'