Fixes & Store Tests