Make tests even more robust