little adjustments to Services, Enties and Tests