Remove flash string template and class option, update tests