Updated calliper tests