Fixed tests so they are no longer configuration dependant. Fixed a bug where column names were double translated. Issue: #711