more tests and old templates