Fix uniform tests