Add more detective tests