Also, this change will pick up AMO tests. Which are probably in a state of disarray with all the deleting we've been doing. I had planned that we do a pass on all the leftover tests and either delete them or move them to a mkt/ path.