Separate strategy specs, remove 'some' factory