fix tempate interpolation test and build
minor cleanup