more for #1 and maybe #2 also diffsky/test#1 as well