Make baseline test more robust