Fixes for tests rfkelly noticed