Removed default tests and superfluous template