#4 fixing template, refactor test