Added WaterConsumer to consume characters while reading a template file. Renamed test template files.