Refine & add Tester