Got tests working for services