More consistency in tests