[Debug] refactored unit tests