Finish rewrite of stencil using TDD