Moved unit tests to their own directory
Fix dependency ordering