Fix more specs
WIP fixing calendar integration specs