Fix tests, remove duplicated and outdated (obsolete) test templates