Adding Year tag and tests