misc fixes for some tests