Added initial services and tests