Added service value and factory w/ tests