Removed out-of-scope CALENDAR_STANDARD check
Capitalised calendar test shifted to unit tests
New unit unit tests