Refactored Option.getExpirySaturday() into .calculateFutureExpiry() and removed erroneous holiday check. Broke TradingSession.isMarketHoliday() out from .marketIsOpenToday(). Wrote unit tests for both changes and passed.