Removing old unused template. Fixing stalled test.