Template test

Changed this to match what they wanted upstream.