Remove excess test service definitions