REFACTOR: global var and new test method by ahuva