Isolated BoundaryValuesBlockBuilder and its tests
Isolated EquivalenceClassesBlockBuilder and its tests
small fix