[FIX] various test fixes