Updated API for test data isolation