Made minor changes to csv output for both train and test

Also made minor changes to train/models.py and test/models.py