Adding Ziyad's tests