Added measure count (using new collapsed measures collection); updated tests