Added calloc and relevant test