Clean up some repetative code
fix run test fail check