added new code test services and adjusted tests