more test fixes. no not upstream

Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>