Test: fix various test