Refactored tests
Excluded prebaked calendar tests from the solution