Reverted some temporary changes to again reproduce the valid test ouputs for the existing columns.