Fixing unit tests from full calendar changes