Updates to calendar

Refactor of test file names