Moving tests to top-level directory