More updates to allow tests when builddir != srcdir.