Move tests to conventional location