test tweaks verify new, type-safer API