Fixed short_url generation (the fix was present on the pull request related to these changes).
Test for short_url generation.
Test Model.save() performance with content translation.

TODO: Apparent query counts are surprising, this needs to be
investigated on master.