Also rewrite dependency searching so we have a single file with all test macros. --HG-- branch : minor