refactor unit tests structure