Topics are updated to use services and pass all unit tests