SOA/ServiceImplementation model tests, corrected multiple TODOs