Added effeciency counters and test arrays