Merging test suite updates from stage