More features to calendar test