small fixes in the services,
updated tests