Resolved Calendar related rspec tests
deleted conflicting files