updated teststuff to use multi-dimensional dictionary