New not image test; fixes