updating to get closer to being ready for module-ing, templates out of tests