Move tests in tree and further cleanup