Have working Discovery and Delete tests