fixed some tests, cleaned up root folders.