modified tests and template