multiple fixes for misc. test methods