Code improvements + added tests for vacation date regexps handling