Fix for Khorsi and Khorsi tests