Removed @VisibleForTesting annotation again