[3.9] Give some love to unit tests