#3 master - few refactor + add testYear