Fixed tests and removed a test template