Working on Moqawalati test cases