Fix tests with new calibrants