added new way of col naming and fixed partition tests