little refactoring of RootActivity and test suite class