Match steps closer to step execution
Remove File::ShareDir stuff