merge test related changes