refact reskin test code