Adding missing changes to test suits and configs before merging to 4.4-forward