Scalendar unit tests re-factoring