Remove link to opt from etc and Add spec test