Cleanup
Add blacksmith back
Nasty hack to fix the tests
Nasty hack to fix the tests