Moved tests to top level dir