(bug 5134) merge /t and /test directories

Having two directories is not ideal! Merge the two.