finished off remaining test stubs and a couple small refactors on tests and templates