Added service aliases. More Tests