Made some modifications to run on test_isolate table