Update test and add common interface for rest and soap services