Cleaned up tests and removed use of testEnv, use noShrink selectively
instead