start merge hwTest and Control code