Relevance test tweaks