No "general" file, and more short URL tests