Revert "Moving unstable tests into staging."

This reverts commit d9b873627cda992a1d660bd3f41fe80eebae1b67.

Will try a more detailed approach.