Enhance test setup