Refactor tests to use Fabricate