Calculated columns implemented and tested