fix up tests for bsd/netbsd changes