improve template and test