Addressed TJ's comments: removed mime type regexp option.

... also renamed variable and added blank lines between tests.