Remove dummy solution counter - what did it do here?
Reorg tests - a little