First half of week 6, pull request

This can also be `spec/support/uploads/...`