added check for 'shortcodes' option so it doesn't ruin binary files
fixed tests