Fix the related tests