Updated tests in preparation for Paperclip 4.0
Don't use Paperclip 4 till you fix the issues with it