making diana non-static, fixing bugs, adding testcases