Change few things for tests and add cleaned informations in templates