vpakan_Refactor o.j.r.swt.test.handler(s) classes