Make test retrieval more sensible