Improve unittest build system (#13554)