Some test setup optimizations