tweak test and template to pass the test