Reordered repos, fixed unit tests