organizing base templates better for more tests