added calcpropval func and tests