(bug 5134) merge /t and /test directories

Having two directories is not ideal! Merge the two.
(bug 5134) mret /t and /test

Move the other way :)
Merge pull request #447 from rahaeli/bug5134

(bug 5134) merge /t and /test directories