V1 train

Mostly changed the test case names to match Rafa's spreadsheet.