Fixed TX issues in some tests