Fix/refine jacky tests.