Store Top 256 dup surface forms; minor test fixes