Service fixes, test structure developed, model fixed.