Refining GoesVariable model and updating CsvToModel and corresponding tests