Renamed FLAKY? to SAME? and split test name into two fields