Sulfuras
More test refactoring