1/22/2014 changes - mostly test