Allow media file names with spaces in them (Second try, now with working tests)

Add quotes around the media files to allow media files with spaces in them instead of hanging in the contructor.

Sorry for the first failing pull request, I'm kinda new to testing, but I think it's working now.