Updated tests and svc.txt