+ Added simple service tests and service listener tests