Simplified sanitation checks for Reader classes, added ability to either read from a file or from input for templates, updated tests