Unit tests

These unit tests cover the functionality but tend to ignore exception points.  

Important in this change is the resourceName is now serviceName