More test fixes: squash me