reduce use of templates to reduce exe size.
cleanup tests