Merge "Add staged test config for new and unstable tests." into main