Remove unneeded service registrations in option tests