CE-413 correcting failing tests due to fieldnames changes