This commit does some restructuring to make common utils available for future similar test for other brands