some refactoring, added/updated tests
created two now fields sessionWeek and sessionYear