Clean up tests. Remove templates