Expanded test matrix to 12 by 12 -- fixed some issues