Remove test files
Replace tags and calendar template