Reorganize Tests
Reorganize bootstrap
Reorganize tests