(Activity) Added unit tests based on code coverage analysis