tests improved using the new Services layer