Implemented story-level discards; added discard validation to unit tests