Adding Usama and Marshall's tests