- make the MainActivity launch first
 - refactor some tests
Fix some bugs