cleaned up old service references
added some unit tests