fix tests (missing from last commit, tisk); tiny api tweaks