Fix for vacation tests, with todos added.