Updated and corrected specs and fixtures