Sync Soa to allow Service Tests 

Fix some tests in SOA repo until sync of master branch of SOA repo.