back to old problem with merging results from public/secret test, #20
vanilla merged + first working test for #20