Fix User-Item association and related specs