r9198: more needed tests