Fix tests
Re order fields