Remove calendar2/more tests