Add calendar modal
Fix server test