added some more tests and create calendar working