Test improvements

The template for tests is slightly improved