New tests and no serialzation code for service graph needed.