Fix typo in test name (confusing)
Refactor to make it possible for the linker to remove, by default, less used Calendar types from applications