include blacksmith and expand test matrix