Updating test suite for new per-item tests