Improve Ironfan UT coverage