Refactor: Only parse the required fields in state test data