Added year test and year to index