Fixed problems with test numbers in setup blocks