Add year and year integration tests